8fe106
@@ -68,9 +68,10 @@
public final class CxfHeaderHelper {
 
                 if (Exchange.CONTENT_TYPE.equals(entry.getKey())) {
                     message.put(Message.CONTENT_TYPE, entry.getValue());
-                } else if (Client.REQUEST_CONTEXT.equals(entry.getKey())
-                            || Client.RESPONSE_CONTEXT.equals(entry.getKey())
-                            || Message.RESPONSE_CODE.equals(entry.getKey())) {
+                }
+                if (Client.REQUEST_CONTEXT.equals(entry.getKey())
+                    || Client.RESPONSE_CONTEXT.equals(entry.getKey())
+                    || Message.RESPONSE_CODE.equals(entry.getKey())) {
                     message.put(entry.getKey(), entry.getValue());
                 } else {
                     Object values = entry.getValue();
